Undoing accidental revert of AJ's fix in
f3b4261f58285c198cf7e53cb373c5ba24caba0f