Reverted extension config changes, keeping tests