#958 - Throw old code at feature toggle to work when is not enable