Fix after config changes

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

Change-Id: I136135c0c85ed6b07850528212366debfc7fe05b