Isolate what's breaking stuff.

Find a better way to do this.