Revert "v2.2.1 fixes bad assemblies released in 2.2.0"

This reverts commit 1832ebbd3f42f37d10305c246a2810ee4cf7c259.