Back out one of the changes from the previous commit that wasn't necessary to fix...