Revert "Merge branch 'aggressive-replan'"

This reverts commit 63d6f5517ed3d02f83b69baed05860f814e2d7fd, reversing
changes made to 6ea4d8201f7dd68b9d8f471c92f12a96f6b208fc.