This reverts commit 17e37ba57a because it introduced a circular dependency between Core and Common. Because d0371f4736 fixed a build issue, we no longer need that dependency.
17e37ba57a
d0371f4736