This reverts commit 8daac371. The build bots are showing some fails on broadwell and arm. Fix to LNT test suite needs work.