This reverts commit eb799dc350. I recommend reading code before doing cleanup, next time...
eb799dc350