Revert "Fix a null pointer exception in the frontend."