Revert "Use consolidated error page"

This reverts commit 0c1836c4e1f83f5fc52e438a35996e34b0263fbf.