Revert cb55bee..7068b75

This rolls back to commit cb55bee8c4571b3068c2e3d740577d4ba00c75d3.