Fix 1127 in 2-99-maintenance

This reverts #1130 and solves #1127 in a different, simpler way.