Revert d0c74e6..f6ab46a

This rolls back to commit d0c74e67764a5cb405224b39da9f8a1e17ac44d0.