Revert 2d7a958..4e91954

This rolls back to commit 2d7a958c45d89b714927c37dafce0f3fdee28864.
Clean up