Add global catch-all back. 

I prefer it...