Replace hack with Marco's version.