Bug 824677 - Remove error page substitution (WIP)