Restore base tag workaround