090455e24d
That workaround isn't needed anymore. We used to remove these headers because they contained broken include statements which would break the build.