Restored the NotImplementedError, the 1 came there by accident (from another branch).