Revert e49c62f..58e78ef

This rolls back to commit e49c62f3493f9a3f42ee1ff7f977b285098965f6.