This reverts commit 8e5c8aca. This breaks the build. BUG: 414493 Also can we take this to the ML first. Kossebau says we should be doing something different