This is an API-side bug, remove workaround