Another backwards incompatibility we need to work around
Version 2.6.2