Fixed commit was part of a larger commit stack, and this fix was
mistakenly squashed in an unrelated commit, and hence did not make it to
master.