Bug 17206: Fix switch to default framework