revert WyseNynja's commit (breaks things)