Fix after config changes

https://trello.com/c/GCum6lNP/

Change-Id: Ie3aeab16202e2ab96e99bbd97d83a0b2e6655a4d