From: Nathan Lynch <nathanl@austin.ibm.com>

This seems to have slipped in during a manual merge at some point.