Revert commit
(cherry picked from commit 6e3fe1e)
Weird changes to make test runnable
Merge branch 'issue-714' into HEAD
Merge pull request #5 from ppp0/issue-714bis

Issue 714bis