This reverts commit d6d23b495c. This backwards-compatible additional functionality is targeted at the next minor release. There are already backwards-incompatible changes in the master branch so we need to establish a new minor branch.
d6d23b495c
9693c04c9d