Reintegrating revision 4.