This is basically a complete rollback of r155401, as it was determined that