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