Revert "hack to fix view transition crash"

This reverts commit e49efb96cfc3cc855349264d5087b3bf9d3395fd.