Revert "Merge branch 'release1'"

This reverts commit 60d87b0812ac58ded6cd880280d99095b5e6c8f4, reversing
changes made to 700efb189bc2a99833d58083cb4727c77af8b640.