Revert "Catch NotImplementedError in contains(), return None"

This reverts commit c70d18b28807864c3c246ae04baa1ed129f85b70.