Revert 2d0123f..56307ca

This rolls back to commit 2d0123f325abe2dcf92a898547ff73bb28998b11.
fixed view controller issue