Revert e3fa8e5..97960af

This rolls back to commit e3fa8e56a6a468dca1809a47613ddce9db60a79c.