Follow-up to r1726198 This rather critical change was hiding in a later commit that removed the deprecate code.