AUI-975

Hey Jon, 

I wasn't sure about the differences of 1.5.x vs 2.0.x so I wasn't able to get the fix working with the source formattings from the original ticket, but I was able to with the original fix. Not sure if its still correct or not.