Replace !138 because it's a bit problematic and will be better addressed in a follow-up.
This reverts commit 985d360f.