Merge "Remove last HOST_OS check"