Revert "AE: Resolving conflict from pulling in the remote branch after rebasing"

This reverts commit 376e42d70f6278ff83b4689029575a929f532aea, reversing
changes made to 24017b54100ce1d47d321758e1ad23d52ed42fa6.