TEMP hack to see if this resolves Windows issue

Change-Id: I428d13451f1da4f67b48c72ed45cbeb0b256d770
Merge topic 'lookup_table_cleanup' into next

d50ffa52 TEMP hack to see if this resolves Windows issue