Revert e157597..a20c9fa

This rolls back to commit e157597a66fcc5fc55449e90c36c8c827d7f2eac.