Re-enabling this for the PR. Feel free to discuss.