Fixes: #2731 Reset main.inc to old version, cancel previous user commit