Revert "Merge branch 'story1' into release1"

This reverts commit d7b6e2b0cd53169fad2db90d7f1f0dbce80facd7, reversing
changes made to ea383330e25f43b79ed612036bc8d2df1dd245c5.