revert fe586d4 and find another way to address #507

this reverts the changes from #507 so that AMD is no longer broken and also includes an alternative that should address the original concern from #507

cc @elwayman02  @cjohansen