This reverts commit 56b6dbaa. It has been discussed and decided that the no-hash numbering scheme would have unwanted side-effects for people using number-ending layer names for other purposes than incrementation. This revert has been modified to keep commit c402f10a.