Revert "merge from master"

This reverts commit 511f45c7d6bb59d59d438b75b1b01ee5db5843ff, reversing
changes made to 308a219d0f11b77b3a1070eb4dd410074dac46d5.