Accidental backport

One day I'll get it right. Wanted to make sure i had this in before I started other crap.