Revert cdc8568..675628c

This rolls back to commit cdc8568354e40be651cdeb507ffadac61e983a96.