This reverts commit dc98adfb. This should still be done, but this is currently causing some commit ordering issues.