Cherry pick to remove hardcoded lwtnn

Dan Guestrequested to merge
dguest/athena:21.2 into 21.2

We didn't ever cherry pick 0645de5f to 21.2. This should resolve some things we're discussing in !20305 (merged)

Merge request reports