Comment out all the changes, fixes suggested by @n9iels