Revert "c8 - merge story2 to master"

This reverts commit d7bf0584330f9de969b3c8cae019da00044d523f, reversing
changes made to 657201e95a7ec4eb7aa00af37f563ad623d706a2.