Follow up r104314 as noted in bug 21261 comment 9