Revert 206222b..d297891

This rolls back to commit 206222be328338291e041a22bacbbfbbe4b07361.