[core] Revert complicated handling for 404 fixed by Sinatra 1.4.0