Revert "Merge pull request #226 from front-end-FXS/frontend-branch-1"
Revert "Merge pull request #226 from front-end-FXS/frontend-branch-1"

This reverts commit 8118cd063753732d5049cc2a47fac64a526639c2, reversing
changes made to 06b5deb0b763c431401e2aa01e58b6bb3c86118d.

PowellGuaglioneFXS/FXS_frontend,PowellGuaglioneFXS/FXS_frontend,front-end-FXS/FXS_frontend,front-end-FXS/FXS_frontend