[0aa8f12dcc] Restore minimum code to stop failing tests.