re #919 - Revert