fix weird issue on windows with OPTIONAL being defined somewhere

WTF!!!!!!!!!!!!! Who had the glorious idea to provide a define for OPTIONAL when we use it internally as well

Change-Id: I257f82b62978c73c84faa34c8b341d77c017425e