Revert Timm Decker's system breaking changes.

This fixes all broken specs and restores muli-market functionality.