Revert eab829f..ce05c72

This rolls back to commit eab829f75ab214194ef09c301bad988579293424.
Revert "Revert eab829f..ce05c72"

This reverts commit 16f48df9c7347afa258f90347e69d32149aa1a38.
Fix Crash on segue