Part revert of Rewrite for weekend b60fb8b4cff4480b737a894ea943c09ba2e7574b
Merge branch 'to-merge'