Revert previous and followup

Previous change not required (oops) and actual bug was simply
a typo.