Speculatively revert commit 164885 (nadav) in the hope of ressurecting a pile of