There will have another patch for this feature. This reverts commit 6fdcc331, reversing changes made to 67e5d1fd.