Revert my old buildfix, since it works without it now.