This is necessary for OSX where we are using a core context that does not implement any legacy features anymore. Change-Id: I59536e99761691d910fef62cf82ceb03e57725ae
Change-Id: I006062986534950485ffa9e280caad3e37c2f35f