Cherry-pick 3269 and 3271 removed
These don't really seem necessary at all.