r517: Remove wrong commit I did by mistake