Integrating a change I made 5 months ago.