Reintegrating revision 10.