Revert "Merge fix"

This reverts commit c5f8d4bfd8177ce21b07f445ac19412b180afa6f, reversing
changes made to c8eea34ba02db2b46837d35e35ebb0e97a4d8f97.