Revert e5d65e3..7c7f97c

This rolls back to commit e5d65e32316ed24215d28c49f1a7c7c89ae0be59.