revert because for some reason it's not faster though it should be...