Revert ba1883a..ccd9961

This rolls back to commit ba1883a037ad32d226c62574896bc76af8726f2b.