Revert "Prevent redundant ViewController stack"

This reverts commit c6a6325f5e33e4a401171e0d1a97639136b79632.