Revert e0bc376..71b1ae3

This rolls back to commit e0bc37650b471fa1ab2d8ce2ddcfdafbf6fa0c2d.