Shouldn't this be re-enabled?