Revert r304955 - Fix class template deduction for scoped_lock.

Richard decided to fix these cases in Clang, even though they are
representative of a larger problem for more complex
cases.

llvm-svn: 304966