Revert "Merge branch 'test2'"

This reverts commit 6c75855b0a262b8c736c7aa7fc86141356eb454a, reversing
changes made to ad9392620d75d267885d45d4c56538b6693308a4.
Merge remote-tracking branch 'origin/master'