Go back to incremental delta
Merge remote-tracking branch 'nokey/master'
Junk.