Revert "Fix the build that broke in 8281bb210858ed04992eacea7f6d02261e0fc1b1"