Last change prior to reverse integrate: 2980