This reverts commit b0a7defd09. It looks like this doesn't interact correctly with the project diff or with staging, let's revert and reland with bugs fixed. Release Notes: - N/A
b0a7defd09
anyhow
UpdateUserPlan