I did not have a problem with 3.9.3, only nightlies. I should have tried nightlies before 3.9.3 but it seems like they have been removed now.
I will try your fix, I guess it's not possible to know if it made it into the nightly on June 07, 2014 so I'll have to wait for the nightly from June 08, 2014.