Proposed fix for [COOK-3708]

https://tickets.opscode.com/browse/COOK-3708?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel