Revert "resolved conflicts"

This reverts commit 4b9784896855412b926b0879aa1f7d320597ce11, reversing
changes made to ab069e2a27ec06c458866da07dc0f2c7263ec55f.