Revert "Merge branch 'story1' into release1"

This reverts commit 675c36e678a88e75249f311ba5540ef4a406fa4b, reversing
changes made to 7f8b293a1e33f00d5fcb3f20e743b8306f48af1b.