Revert "Merge remote-tracking branch 'hakko/master' - 0.7.19"

This reverts commit 1ad35642deb5bc3c0333fde90b3ad3af6bb92e6e, reversing
changes made to 885aeb701c5519e4474a1e9d2abe74dd97fe1344.