This reverts commit 94c269ba. Still causes too large of compile time regression in normal debug builds. Will put under expensive checks instead.
