Given that we don't enable a bunch of stuff, we can patch this out. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry-picked from e7dacf3cd3)
e7dacf3cd3