This updates the PR to a one-liner to minimize additions. Perhaps we can include opt in the future but let's start with this for now.