Revert the azure update for now - unit tests for azure fail to link.