Commiting this but really will revert because it doesn't seem to work. (But now I have proof)