Revert f08a594..0d120f9

This rolls back to commit f08a59454aa082a2491434f5b88f11efd095261a.