Revert e582356..98e7ada

This rolls back to commit e58235634604541ab624d1d94e634e1344fac3a6.