Replaces the corresponding change in !11013 (merged)
Pretty sure this code has never worked right, but we certainly don't need to make it worse.