Reapplying a previous change overwritten by tracie's recent push.