This reverts commit 6f348b14. Am seeing internal test failures plus a linux kernel breakage reported due to this.