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