Revert 33d5aa61e77e61f700a8 to re-enable A2L conversion