Partial revert of last merge for non-HDMU boxes