Revert "storyboard"

This reverts commit 0fb29fa22e26127d7162e989aa9022d4486f17e8, reversing
changes made to 1d235e274e2481af83cdda14bc341ffbeb73da69.