r2471 Fixed a hack introduced in changeset#2468