Added a temporary workaround for the OAuth ClientID build issue