Revert "Build break fix"