This was done before and had to be rolled back because people use it for both Fire and Physical builds.