Reintegrating revision 12.