Revert 4d06b22..3014127

This rolls back to commit 4d06b22651783336e5b570bb43dc2b2f0b69ddba.