Revert "HW Baseline complete"

This reverts commit 6456374c352a237e1d6f3b791f42f24ea636d957.