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