Revert "Merge commit 'dd391d5'"

This reverts commit 40ae8cdce494d1f261c31c4e6fa66e76b77f003e, reversing
changes made to ad695c1b73bfa32661968a1526f896740aca308c.