COMMON: Revert last commit as rightfully pointed out by fuzze.