This patch is included in platform_build now