Tweak to the fix in r156212, as with the change in removing the shift the