Move the workaround to #setup