Merge "Revert "Fix broken build""