Revert "merge error"

This reverts commit a7438a70c7b981ff7a04f29369135af163541225, reversing
changes made to e5f87e6d6b55a317534f9a89213505fe02ebd6ce.