Work arround #693127 and make vapi fix obsolete.