* Rollback feature flag changes
 * Add tests to ensure two konfa sub classes can co-exist