Merge without activation changes

This plays directly on top of master. To ensure that my removed changes weren't reintroduced, I basically forked master, merged merge-without-activation-changes, resolved conflicts, and pushed the result as merge-without-activation-changes. 

I'm pretty sure that the offending commits are removed as I don't see them in the review below. I'll check again then tag this for the appropriate Jira ticket once I'm sure the offending changes are gone.