Trying to fix the storyboard issue

This reverts commit 78fb49637845061f8f72211b41483764e78e7e20.