Revert "Merged"

This reverts commit a1cfc06d398b10c306867ce2367beb936daeeefb, reversing
changes made to dc73cbb6d14e8486b95f0fd65632e7a522bd5bb1.