This reverts commit 6196554b17. This commit would break backward compatibility. Postpone until 7.0.10.
6196554b17