Revert "Merge branch 'story1' into release1"

This reverts commit 1c46c5ae4dd1acb07687c10a0e2b802493c0162d, reversing
changes made to 805f35693cb66e3ffc92e5963b01bdf5b0c56612.
3) Commit on release1