Revert a674434..27aca5b

This rolls back to commit a67443414eaa186ef2d6284bbc878f39b0e1ac38.