This reverts commit e526a8fa89. This is a repeat of a0ca67d879. The reverted changes break Scaffold. This will need to be fixed in a way that allows Scaffold to continue to work.
e526a8fa89
a0ca67d879