Reinstate workaround