Revert "Merge pull request #459 from git-harry/sprint"

This reverts commit d6b9b1c849807de31afd4ad3f2213ae233b454a8, reversing
changes made to b7998a88c4af5e61123e278b5f8b0ec5e2294da0.
Merge pull request #461 from git-harry/master

Merged automatically by jenkins after successful gate test