Revert 4e01539..27cb8ef

This rolls back to commit 4e01539417bebfedc34587a6c27f39fafec01ba5.