Workaround removed