Revert "Merged"

This reverts commit 3fdd3aa8f6028ba42923c317c6ec844b825a690c, reversing
changes made to 3cefa4b0d2e21ec2156f1a9dc8a7b32ee346cb5e.