This reverts a7c26408 (r53255) and ff75ae1b (r53694), and a hack from 6075ae9a (r46690). svn path=/branches/setup_improvements/; revision=74745 svn path=/branches/setup_improvements/; revision=74746
a7c26408
ff75ae1b
6075ae9a