Revert "Merge branch 'min' into staging"

This reverts commit 059bfe1ac5d008b9ec676b9687b456771b42e557, reversing
changes made to e7dc025e10ff1f8fd759d8f307b0967e57938f9e.