Revert ce113ff..cf66ff9

This rolls back to commit ce113ff4073d3aa21ef34b35a834967b6454894d.