Rolled back 59eda1e - see issue #26