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