Revert c50356d..6a532e1

This rolls back to commit c50356df9070979300c5e60975a2c77f8b614622.