Revert Timm Decker's system breaking changes.