Re-adding frontend hack.