Revert r309372
The bug intended to be fixed by r309372 was already addressed by r296178, so revert my change.
Reported by: seph