Remy Maucherat
committed
on 18 Nov 14
Revert r2538 except leave all the plumbing and the sync cleanup.