Revert c4332ab..60cddb6

This rolls back to commit c4332abb9409e4124fa1b1c61713012780ec66c4.