Revert "now we're getting proprietary"

This reverts commit 5c98c2aaf39add09f8548c3132e90e361e6080f6.
Revert "ch-ch-changes"

This reverts commit f058aa46d08a8454ed9f584eaa0ab2eefddbecc5.