Revert e1a5f8b..2f338f3

This rolls back to commit e1a5f8ba8fa8fb7797f988bfabad81d10b509242.