Revert "Merge branch 'sponce_onlinePhoenix' into 'master'"

This reverts merge request !331 (merged)

Now that master branch has been made up to date with online, we can go back to master.