Revert 6592f31..4ad6c16

This rolls back to commit 6592f31258a30d9a393d0e66e529213dc38b333d.
Revert to adding exit segue