revert part of aabd1b4, thanks cleanrock!