Revert e11804d..ab0a35c

This rolls back to commit e11804d2492221b7b360837c12242a2d3c5cbae1.
Commitzzz