Post-2.2 critical fix

See commit message.