Revert "[Front-end] Fixing the messed up front-end branch"

This reverts commit 2807f91ccbe70951f2759012fb36902a7d4aa929.