Deprecate fixes for 2.11.x