#4177 only checks the passthrough formats. this change may be ok but should not be required after 4177, correct?