Applying Ben patch to remove eval from config