Needed to be able to build devkit images from master.
I'm waiting for the builds to succeed before removing WiP.