Revert c6d8304..ff6b904

This rolls back to commit c6d83043cae3ef20f324d0edd24c94a477d6a9cc.