Revert my commit 191617. It added a clang warning (Thanks to Ed Maste). Add a comment