We needed to remove this for a firmware build, so this probably shouldn't be merged into the main release