Revert "Merge branch 'story1'"

This reverts commit 3e2c9d55826fcc73ba842d294a00ef0c44aa104c, reversing
changes made to 39dbe7b93875df435774105b5f26902255811351.