reverted 315cfbc03be to be nice to travis