This reverts commit 9fc2d777. This appears to cause interface file issues during rebuilds. Punting back to @thomie for further investigation.