Leaving in only what works now (#SUITE-1303)