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