It was reported in the PR that commit caused clang giving errors for code previously considered valid. This reverts commit 6b1aa319.