Backout bcdff2b1d3ec from 0.8 - going to commit a slightly cleaner patch for the...