Revert "Merged local conflicts"

This reverts commit 8f0f480090e92b485b3e347ba9d5b8a60e579807, reversing
changes made to 50aed35773f453b6e430df7020537a298c3680a0.