Revert dc1a62d..abf68e5

This rolls back to commit dc1a62dbc13cb207cd104c20ff2875a63d301c3f.