Revert "FrontEnd Change for #75"

This reverts commit 9303ab5803eacdfeb8c82e81e3763d3cea35c5a7.