Revert 6cbff62..acd6a45

This rolls back to commit 6cbff6286a191372a5c4c2fbca20540d0e13dd0f.