Revert to official boilerplate