You can use changesets or a similar pattern to avoid this.