Revert "Merge branch 'master' into 'new-ui'"

This reverts commit 9cb84255518384f01413f02acb38b1e4eecd0c35, reversing
changes made to f11ec474a89b6687a57e8992b92517d3f387c87b.