Revert "Merge branch 'beta'"

This reverts commit 8b6e1eca06d814fbb48183bd9c5d192db9b4f733, reversing
changes made to 148ec9af673faced0711745722f172ca25b4aceb.