Revert r88639 (the optimization changes behaviour and breaks buildbots)
4 files changed