Revert ddf6b51..13a83c9

This rolls back to commit ddf6b51181fcbbf6121bfa34fefb667021fbd0fb.
Revert 13a83c9..0e3a787

This rolls back to commit 13a83c9391b7629b38fd8e84de2bfd0e1b190a5d.
Added 404 page