This reverts commit 15f2431e9d. This really belongs on mainline, not RELENG_1_2, since it is a new feature.
15f2431e9d