Revert "Merge branch 'master' into adding_front_end"

This reverts commit c0d3b585d3adfef7fdaa10ad5b69368165a360e1, reversing
changes made to d4659c21e356f08cc86722694b4b158d26d12019.