Revert "Merge conflict"

This reverts commit fa64ee222bad9ceffd797342eb06e7ecac7b7e7f, reversing
changes made to ef27cff09a388e6628d14e3bab12bc6763a6dc8b.