This logic was missing from the last check-in for some reason.