Revert "Fix for Almond AMD"

This reverts commit 47cf4f4814f4111f00837407d015db4e5ab283c3.
update build