Revert 89f1e84..9ca6328

This rolls back to commit 89f1e8490dee4ff5c3d0a30b7d9fd8c5b15c4f54.