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