Revert "changes made for testing on old hardware"

This reverts commit 954b31c7c1867ca830868c84740c76f17ceb3805.