Rollback to the last stable version because Git merged in the wrong direction (thanks for that btw)