Merge "Revert "Workaround for Clang emitting spurious Wunused-lambda-capture warning""