This reverts commit 186b1b2b. There are still some stability problems on some SI boards so bring this back.