Re-commit wrongly reverted previous change.