This reverts commit 3b95ab56. It regressed some legacy source file property behavior. Revert pending further investigation.