Someday we should make this a decorator (or ask ourselves why we're doing it).