Remove experimental feature from bug #8929