Reverted workaround API server bug.