Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit ae0de87518de17f439685f50be36986ad37637f0.