Re-enable after merge.