Revert "merging with master"

This reverts commit 42fd31d3034b54ab241635235705e59141d7c927, reversing
changes made to 1d642f68d7e1603f2dc0e6d4976472fa4b0f71a3.