Revert 9222cb3..0aff443

This rolls back to commit 9222cb301bc85429e829fa20fd9d7a4c88f64980.