Removed fatal errors caused by #2004244.