This reverts merge request !331 (merged)
Now that master branch has been made up to date with online, we can go back to master.