entr-1.9 committed by jturner. Removing from WIP