The more verbose form existed for decreased differences with the 2.4
backport.  But differences in this area existed anyway, so why not
clean up the 2.6 versions even more.