Revert db9bcf2..34d8b29

This rolls back to commit db9bcf2d26d247b612ca090ca6ac36716deac3f4.