This reverts commit 714e11d535. That commit was unilateral and disregarded past discussions.
714e11d535