Remove temp workaround