* Bring in line with nonsenz's commit.