Revert e8b784e..e9558f2

This rolls back to commit e8b784ed59a1aeded2d461b14ed5d94e21cd24c3.