Revert "merge with master"

This reverts commit 35385915c76eb7bf39c314f037f9aec279d64c92, reversing
changes made to 1b88b455822837e9c07e144555aaa9bf2087b40e.