Revert "Merge branch 'beta'"

This reverts commit 1e2250dce391bcf120220a69106cb4fd1c644f00, reversing
changes made to afd71e91e4f35165257e04c1fc233e917b46465d.