Remove functional test workaround