The fix in the last commit was incomplete; really fix it this time.