Temporary build fix, need to confirm that with Kris.