Revert "CONFLICT"

This reverts commit 27ce9e1c186c721c81665202ef35b58377e89e6c, reversing
changes made to 413f9fdacb2445840e9da777879de0846e6cd5da.