Undo per device build in previous commit