Revert e865e9d..b8acbdd

This rolls back to commit e865e9d34026ee038109a37bc16c56e0dce06005.