[WIP] Bug 912010

Just want travis to take a look at it.