IMHO, again this code should go inside a version upgrade.