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

This reverts commit 3982b9d41acb6734bc98972470dbe2baaada2705, reversing
changes made to d73cd2f6e79f2befbda0ac56ad975de47887f39d.