Reverting to fix fw screen missing issue