Revert to original version of setxid race fix