Revert "merge with master"

This reverts commit c622ef3f50a0c156659e6627ec6dde179fe85d87, reversing
changes made to 4d0a117f204ab40b29b22949ebfaa088958b908d.