Some reversions of recent commits re: portfolio failure.