Revert f9f6324..4cd2f02

This rolls back to commit f9f6324dfc795ecf30c95b1953682d49fe30a37a.