Revert "Enable a bit more."
play it safe

This reverts commit 8ed27c58dfd2f81c83a608f424a8b861dfebedb2.