Uncomment as soon as Bennett's changes are merged