Undo temporary changes used for build-farm testing of ACL patch.